* Standards-Version: 4.1.5 (no changes required)
* New upstream release
- d/libostree-1-1.symbols: Update
+ - Drop all patches, applied upstream
-- Simon McVittie <smcv@debian.org> Wed, 04 Jul 2018 13:37:44 +0100
+++ /dev/null
-From: Simon McVittie <smcv@debian.org>
-Date: Sun, 24 Jun 2018 12:56:49 +0100
-Subject: OstreeRepoFinderConfig: Fix guint/gsize confusion
-
-If a function has a guint "out argument", passing a pointer to a gsize
-is not, in general, valid. On an ILP64 platform there is no problem
-since guint and gsize are identical, but on an LP64 platform it will
-overwrite only the first word of the gsize, leaving the second word
-unaffected. On little-endian machines, if the second word is
-zero-initialized (as it is here), the result is numerically equal to
-the guint, but on big-endian machines the result is around 4 billion
-times what it should be, resulting in
-ostree_repo_finder_config_resolve_async() reading past the end of
-the array and causing undefined behaviour.
-
-In practice this caused assertion failures (and consequently test
-failures) on Debian's s390x (z/Architecture), ppc64 (64-bit PowerPC)
-and sparc64 (64-bit SPARC) ports.
-
-Bug: https://github.com/ostreedev/ostree/issues/1640
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=902209
-Forwarded: https://github.com/ostreedev/ostree/pull/1641
-Signed-off-by: Simon McVittie <smcv@debian.org>
----
- src/libostree/ostree-repo-finder-config.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/libostree/ostree-repo-finder-config.c b/src/libostree/ostree-repo-finder-config.c
-index 4366d72..06f6165 100644
---- a/src/libostree/ostree-repo-finder-config.c
-+++ b/src/libostree/ostree-repo-finder-config.c
-@@ -96,7 +96,7 @@ ostree_repo_finder_config_resolve_async (OstreeRepoFinder *find
- GHashTableIter iter;
- const gchar *remote_name;
- g_auto(GStrv) remotes = NULL;
-- gsize n_remotes = 0;
-+ guint n_remotes = 0;
-
- task = g_task_new (finder, cancellable, callback, user_data);
- g_task_set_source_tag (task, ostree_repo_finder_config_resolve_async);
-@@ -106,9 +106,9 @@ ostree_repo_finder_config_resolve_async (OstreeRepoFinder *find
-
- /* List all remotes in this #OstreeRepo and see which of their ref lists
- * intersect with @refs. */
-- remotes = ostree_repo_remote_list (parent_repo, (guint *) &n_remotes);
-+ remotes = ostree_repo_remote_list (parent_repo, &n_remotes);
-
-- g_debug ("%s: Checking %" G_GSIZE_FORMAT " remotes", G_STRFUNC, n_remotes);
-+ g_debug ("%s: Checking %u remotes", G_STRFUNC, n_remotes);
-
- for (i = 0; i < n_remotes; i++)
- {
+++ /dev/null
-From: Simon McVittie <smcv@debian.org>
-Date: Fri, 22 Jun 2018 01:10:55 +0100
-Subject: avahi: Fail immediately if we can't talk to D-Bus or Avahi
-
-We special-case AVAHI_ERR_NO_DAEMON to not cause warnings, but if
-we pass AVAHI_CLIENT_NO_FAIL to avahi_client_new, we never actually
-see AVAHI_ERR_NO_DAEMON. Instead, we will get AVAHI_ERR_BAD_STATE
-when we try to use the client.
-
-Bug: https://github.com/ostreedev/ostree/issues/1618
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Forwarded: https://github.com/ostreedev/ostree/pull/1639
-Applied-upstream: 2018.7, commit:https://github.com/ostreedev/ostree/commit/e120a6b1198aaa785533c76316898f15a804dae1
----
- src/libostree/ostree-repo-finder-avahi.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/libostree/ostree-repo-finder-avahi.c b/src/libostree/ostree-repo-finder-avahi.c
-index 223d8f0..bc38376 100644
---- a/src/libostree/ostree-repo-finder-avahi.c
-+++ b/src/libostree/ostree-repo-finder-avahi.c
-@@ -1432,8 +1432,7 @@ ostree_repo_finder_avahi_start (OstreeRepoFinderAvahi *self,
-
- g_assert (self->client == NULL);
-
-- client = avahi_client_new (avahi_glib_poll_get (self->poll),
-- AVAHI_CLIENT_NO_FAIL,
-+ client = avahi_client_new (avahi_glib_poll_get (self->poll), 0,
- client_cb, self, &failure);
-
- if (client == NULL)
+++ /dev/null
-From: Colin Walters <walters@verbum.org>
-Date: Thu, 21 Jun 2018 14:17:28 +0000
-Subject: lib/repo: Fix 32 bit format string error
-
-Origin: upstream, 2018.7, commit:1174d9f5ba537562c67084caf0214544fbb14ffc
----
- src/libostree/ostree-repo-commit.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
-index 37be748..7e1d707 100644
---- a/src/libostree/ostree-repo-commit.c
-+++ b/src/libostree/ostree-repo-commit.c
-@@ -903,7 +903,7 @@ write_content_object (OstreeRepo *self,
- return glnx_throw (error, "min-free-space-percent '%u%%' would be exceeded, %s more required",
- self->min_free_space_percent, formatted_required);
- else
-- return glnx_throw (error, "min-free-space-size %luMB would be exceeded, %s more required",
-+ return glnx_throw (error, "min-free-space-size %" G_GUINT64_FORMAT "MB would be exceeded, %s more required",
- self->min_free_space_mb, formatted_required);
- }
- /* This is the main bit that needs mutex protection */
-@@ -1617,7 +1617,7 @@ ostree_repo_prepare_transaction (OstreeRepo *self,
- return glnx_throw (error, "min-free-space-percent '%u%%' would be exceeded, %s available",
- self->min_free_space_percent, formatted_free);
- else
-- return glnx_throw (error, "min-free-space-size %luMB would be exceeded, %s available",
-+ return glnx_throw (error, "min-free-space-size %" G_GUINT64_FORMAT "MB would be exceeded, %s available",
- self->min_free_space_mb, formatted_free);
- }
- g_mutex_unlock (&self->txn_lock);
+++ /dev/null
-lib-repo-Fix-32-bit-format-string-error.patch
-avahi-Fail-immediately-if-we-can-t-talk-to-D-Bus-or-Avahi.patch
-OstreeRepoFinderConfig-Fix-guint-gsize-confusion.patch
projects / ostree.git / commitdiff